Fixed wrongly resolved merge conflicts.

* Fixed wrongly resolved merge conflicts.

svn path=/trunk/; revision=20633

diff --git a/gtk/gtk.symbols b/gtk/gtk.symbols
index 3bf67ca8e83ff4753410ddbd0a2904d49071b8ed..4f4c2d00fc097c20c3b61037384f7effa1fb0151 100644 (file)
--- a/gtk/gtk.symbols
+++ b/gtk/gtk.symbols
@@ -4770,7 +4770,6 @@ gtk_widget_trigger_tooltip_query
 gtk_widget_unmap
 gtk_widget_unparent
 gtk_widget_unrealize
-gtk_widget_unref
 gtk_widget_get_allocation
 gtk_widget_get_window
 #endif

diff --git a/gtk/gtkliststore.h b/gtk/gtkliststore.h
index 0d893b8484a5480d4b845becbeb087dceeeafc8d..e03c3bccfcddf26f61fea309816825dd90b197fe 100644 (file)
--- a/gtk/gtkliststore.h
+++ b/gtk/gtkliststore.h
@@ -58,7 +58,7 @@ struct _GtkListStore
   gint GSEAL (length);
   GtkTreeIterCompareFunc GSEAL (default_sort_func);
   gpointer GSEAL (default_sort_data);
-  GtkDestroyNotify GSEAL (default_sort_destroy);
+  GDestroyNotify GSEAL (default_sort_destroy);
   guint GSEAL (columns_dirty) : 1;
 };
 

diff --git a/gtk/gtktreemodelsort.h b/gtk/gtktreemodelsort.h
index 55f7c8268f4a38b0a4c1fc3e8a4ff31069972792..cc39aa531626f7404b662a00481632c9f52825a6 100644 (file)
--- a/gtk/gtktreemodelsort.h
+++ b/gtk/gtktreemodelsort.h
@@ -59,7 +59,7 @@ struct _GtkTreeModelSort
   /* default sort */
   GtkTreeIterCompareFunc GSEAL (default_sort_func);
   gpointer GSEAL (default_sort_data);
-  GtkDestroyNotify GSEAL (default_sort_destroy);
+  GDestroyNotify GSEAL (default_sort_destroy);
 
   /* signal ids */
   guint GSEAL (changed_id);

diff --git a/gtk/gtktreeselection.h b/gtk/gtktreeselection.h
index 04320e4b3c9b7b7204be47fcebf2e7bc50397c89..885b144e929add8f4b853dffe68a4383b79d199f 100644 (file)
--- a/gtk/gtktreeselection.h
+++ b/gtk/gtktreeselection.h
@@ -58,7 +58,7 @@ struct _GtkTreeSelection
   GtkSelectionMode GSEAL (type);
   GtkTreeSelectionFunc GSEAL (user_func);
   gpointer GSEAL (user_data);
-  GtkDestroyNotify GSEAL (destroy);
+  GDestroyNotify GSEAL (destroy);
 };
 
 struct _GtkTreeSelectionClass

diff --git a/gtk/gtktreestore.h b/gtk/gtktreestore.h
index d14de83e9f4b47aa0a2ad6cfb6d0bf07e483de20..f9f324001a24080c463680dbf3497b2565c36bb8 100644 (file)
--- a/gtk/gtktreestore.h
+++ b/gtk/gtktreestore.h
@@ -57,7 +57,7 @@ struct _GtkTreeStore
   GType *GSEAL (column_headers);
   GtkTreeIterCompareFunc GSEAL (default_sort_func);
   gpointer GSEAL (default_sort_data);
-  GtkDestroyNotify GSEAL (default_sort_destroy);
+  GDestroyNotify GSEAL (default_sort_destroy);
   guint GSEAL (columns_dirty) : 1;
 };